Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson project changes based on wrap submission review #391

Merged
merged 2 commits into from
Dec 15, 2022

Conversation

UnixY2K
Copy link
Contributor

@UnixY2K UnixY2K commented Dec 13, 2022

description

this PR makes checks if there is a bundled sqlite3 in OSX that does not support load extension and disables the support automatically

note: line feeds were changed from CRLF to LF

changes

  • meson_options.txt
    • changed SQLITE_OMMIT_LOAD_EXTENSION to SQLITE_OMIT_LOAD_EXTENSION (typo fix)
  • meson. Build
    • change the version to 3.2.1
    • changed SQLITECPP_USE_STACK_PROTECTOR to SQLITECPP_USE_STACK_PROTECTION (typo fix)
    • adds the SQLITE_OMIT_LOAD_EXTENSION option and enables it if running on MacOS with a bundled sqlite that does not supports it

additional notes

on wrapdb this can be added as a patch as is only a change in the meson files and not the project itself

edit: there is a list of other changes that can be seen on the wrapdb repo

@UnixY2K
Copy link
Contributor Author

UnixY2K commented Dec 13, 2022

note: related to mesonbuild/wrapdb#816

@UnixY2K
Copy link
Contributor Author

UnixY2K commented Dec 13, 2022

currently doing a code review for this update on wrapdb repo

@UnixY2K UnixY2K changed the title [meson] omit load extension when using MacOS meson project changes based on wrap submission review Dec 13, 2022
@SRombauts
Copy link
Owner

Hello @ninjaoflight

Thank you again for all the work you are doing in this area!

Could you write a quick start on how to use meson? I think it's worth adding to a section in the readme, after the chapter on CMake.

Then I should add a new Github Actions workflow to test meson build automatically

@SRombauts SRombauts self-assigned this Dec 13, 2022
@UnixY2K UnixY2K mentioned this pull request Dec 14, 2022
8 tasks
change version to 3.2.1
change file sources array to files()
comment default flags
check for sqlite3_load_extension support
change warning() to message('warning:
@UnixY2K
Copy link
Contributor Author

UnixY2K commented Dec 14, 2022

code review completed, this should be ready to be merged
compiling under MacOS VENTURA 13.0.1
as for the Mac OS 11 related issue please see #394

meson.build Outdated Show resolved Hide resolved
@SRombauts SRombauts merged commit 6ebb328 into SRombauts:master Dec 15, 2022
@UnixY2K UnixY2K deleted the meson-macos-fix branch December 17, 2022 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants